Starting to clean code