Extract private method
Remove useless comment
Update documentation
Remove unnecessary bourne dependency