Some minor refactoring
Added silent h words