Some refactoring and reformatting