Minor cosmetic fixes
100% code test coverage