Updating to clean up init