house keeping

tidy up some attributes