Cleaned up comments and output data