code cleanup, finally moved the Storage Blocks to one 1 Block ID