Cleanup: Code cleanup, comments, etc.