Fix order and remove unnecessary whitespace