fix whitespace
fix ordering