refactor...a little