Some code-beautification