cleaning up part II