* Cleanup and comments