Cleanup, comments, renames