Codestyle and some minor stuff.