Code amd style cleaning
Code and style cleaning
Merge pull request #60 from obiba/code-and-style

Code and style cleaning