more refactoring like a baws