cleaned up comments, extra lines