Continue refactoring + code-style somewhere