Additional cleanup
Added another test case
Reviewed fixer order