Cosmetic changes
Merge https://github.com/gmatteo/pseudo_dojo
 Fix minor problems