Clean up

Cleaned up code and comments.