cleaning up; minor changes