First run-through of cleaning up aesthetics.