javabuzz refactored