Work on styling and clean up