Extracted calculations
Further refactorings
Relayout
In order to extract the CGRectMove methods