removed unnecessary units, added 'use strict' and fixed smaller issues and indentation