Keywords update and code cleanup
Pep257 docstring convention