Refactor and change style back