Sounds good, some lines are still using tabs for alignment so a full refactor would probably be the best way to address all the issues at once.