Re-order storage methods so each wrapper has the same pattern

get, set, delete