Removed reduntant returns, fixs PEP7
Fix documentation