Change some ordering and added one space