extract methods, rename variables, clean code
 Please enter the commit message for your changes. Lines starting