Cleaning up unecessary comments and reorganize output messages