fix some stuff and re-indent class