Refactoring. Cleaning the code and deleting unneeded things