Change order in order to improve readability