Small tweaks to the class