pep8'ing some key service modules