Clean-up according to code-style