fix format and remove $.