Migration

I know you love big pull requests, so here: extra for you <3 <3
I stumbled upon some codestyle things and fixed them in extra commits.
But: The commits are easy to understand, only code migration and some simple things :)