Fix code style
Rename variable
Separate contollers