finished shape refactor. added cleanup scripts