worked on cleanup