Quickfix for a lot of annoying warnings, and a bit of indenting