fix typo and fixing order according to strict mode