Refactoring (jshint, timeouts, icons)