76 clean code

[EmelieBrobergs]

close #76

Code cleaned together with Emina over LiveSHare. Regularly checked app in android during refactoring of code.

• Emina will check iOS for approval