Removed some complexity from Goal#validate