Codestyle and small bugfix