cleaned things up; still need to deal with strictness