Some small changes to clean things up