starting to clean code