Made some refactoring and now uses use strict in a proper way