Keep it simple, stupid.

Done refactoring.