Updates to clean things up