Refactor code

Take a look on the commits