Code cleaning
Merge pull request #57 from obiba/various-code-and-style-fixes

Code cleaning