Did some cleanup, comments, etc.