breeze.net more refactoring