Some commenting and formatting