Minor Changes

Changed to proper naming, added comments