Refactored the method to simpler and sweeter :-)