Cleaning up code, removing unused imports etc..