Do some general tidying up

Clean up some whitespace
Add comments
Remove storeconfigigs as a requirement