Add "use strict" + code cleanup