Some coding-style-corrections