Cleanup to use strict mode