Refactoring, renaming methods, removing dead code etc.