morning commit, minor refactor