fixup! Order imports and correct spacing between functions/classes