Slight improvements in code-quality