Fix/jshint unused vars