Fixed ordering and whitespace issues