Add some documentation and update bin files to allow method name
Refactor a little