Move to a single strict mode setter
Fix whitespace issues