breeze.net - more refactoring