Improve comments and output string capitalization