Code nazi & added some comments