Remove unused variable
Fixed long lines