lint fix and removed unused var