Conform to "use strict";

Re-structured for readability