Goal encoding and cleanups