Ran format, organise imports and cleanup to get everything in sync.