cleaned up; ready for release