More improved commenting and organization