even more refactoring - looking nice now