More commenting and formatting