Refactor and Style