some codestyle and minor changes