Refactoring code

Thought up after read some article