refactoring out some nonsense