The Dreamer Code Clean Up