Ran formatter, organise imports and cleanup on code to get it all ion sync.