Useless refactoring and some fixed styling