better comment and organization