Goal Learning Cleaned Up