better names and a typo