did a bunch of cleanup for publishing
did a bunch of cleanup for publishing