Edited comments and output format for cleaner display