Some improvements on the code and structure

* Code style, spaces and other improvements
* All tests passing
* Bin cleaning
* test/case dir was created to maintain files for cases isolated
no need to re-use, no need to have a named function.