Renames, Moves, Constants Extracted, Some Refactoring