Cleaning up sloppiness in prev drafts