fixed to comply with pep8 and dxr standards