Updating authors and cleaning up a little bit