Added text to separator, minor refactoring, all pep8