Edited some comments & formatting