Clean some names and style