cleaned up comments, output, etc