Small changes to styling and clean up code