Improved organization in the code

verbosity code was completely removed (it didn't helped debugging too
much), and useless pieces of code were removed.