Code cleanup
Merge branch 'master' of git@github.com:Delors/Vespucci2.git