Update: Jslint compliant