refactor, cleanup -- horrible commit message