Change attributes to properties, remove extraneous things