more clenaups of Blockallocated code (small refactoring bug fixed)