sloppy refactoring