Fixing formatting, and un-used imports/methods/variables...