store: Imports and whitespace cleanup