Fixing style issues discovered while npm testing