styling +refactor