Cleaning up minor issues like duplicate varable declaration