Cleaned up goals scaffold