pep and merge cleanup