Additiional documentation and pep8 changes