Cosmetic improvements to make code more readable

Was not able to test yet since I am missing the hardware at the moment. Will do that as soon as I get it back.