add styling and start cleaning up code