Remove unused variable
Fix misplaced constants