Small refactoring, reformating & cleaning