made small changes to clean up