Fix wrong order + formatting