Cleaned up and styled.

Checkpoint complete!