Cosmetic changes
Better descriptions in comments
Better display of results