clean up and add marvin