Some refactoring and styling