Some more cleanup, code-style is tedious