[MIN] pep8 and renaming

*deleted some parts that are not used any more
*based on github feedback