Some refactoring
I forgot to pull before making changes...
Some small (mostly cosmetic) changes