Fixed ordering of code after feedback