Misc style fixes. Remove unused variable.