[TASK] Code cleanup

Hi @kbond,
I added a new branch for development and reviewing purposes starting with some code cosmetics.

Cheers
Björn