style improvements and a name change