Cleaning up

Cleaning up code and visuals and adding comments.