This commit cleanups codestyle a bit, yet there is still some work to be done