1. Move values (strings and integers) to proper xml files 2. Define rules for naming conventions and change the variable names in code and XML files 3. Write meaningful comments for all classes and important functions 4. Move classes (if necessary)