cleanup - added more attributes