Some clean up and some credit