minor updates to clean up code