Fixed string -> str to follow numpydoc convention
Fixed integer -> int to follow numpydoc convention