Cleanup and comments

Cleanup and comments