Comment updates

Cleanup and add comments