Refactor and restyle