cleaned things up n added comments