Cleaned up aesthetics a bit