refac: grammar, code style