'use strict' compliancy, refactoring, v0.1.5