Clean up aesthetics