Import order and newline fixes