Clean up ga implementation further