Cleaned up comments and spacing