+ got rid of some unneccessary code