cleaning up a bit after refactor