Corrected the order of statuses still didn't refactor the code