Changes to clean up