remove unicode spaces from comments
fix spelling
refactoring