Cleaning up, adding styles