cleaned up some attributes