bigboybamo refactored code