refactoring stuffz