Moved storage to a single key containing a JSON model
Remove uneccassary init()'s