Cleaned up output and comments