refactoring...?