fix typo and delete shorthands