some code enhancement
more rafactoring on code
little code refactoring
removes useless parameter
Merge pull request #4 from massyl/master

the remaining code refactored