fixed the ordering to make it consistant and also removed unneeded comments