cleanup and add marvin