cleaned up adam