Simpler and better single point blob, refactored code