Cleaned up a few aesthetics