Added Recipe2, cleaned up code