Codestyle and fixes.