Codestyle and minor bug