Doing some syntax cleanup, comments, etc.