Cleaned up comments and standard output