cleaned up comments and spacing