Removed buggy optionnal param.
Removed binary. Split functions into files.