divided some method into separate private methods
Merge branch 'clientToModelCommands' of https://github.com/lucaspi/AndroidRally into clientToModelCommands