code-style and simplifications