debugger: Clean up
debugger: correct order
debugger: Adding and fixing edge case (switch case)