Fix indentation following tomdoc pattern
Update to use only instance variable in Storage
Remove extra space and align blocks