Code styling
More readable code

Based on Toon's feedback: http://git.sumocoders.be/farmaka-app/merge_requests/930/diffs#note_2346
Merge pull request #49 from sumocoders/More-readable-code

More readable code