The result isn't perfect, but it cleans up the whitespace and makes the code more consistent with the rest of the project.
However, it still won't work (no gorm, commented code, ...). Borrow an old implementation of the Storage class until I figure out just what it's being used for.