Tidy source code

Correct indentation, and undo unintentional changes to imports due to an Organise Imports run in Eclipse.