Code cleanup
Added storage interface