Clean up stray debuggers/comments and add clarifying comments as well