little more refactoring/removing derps