Fix spelling errors and some refactoring
Merge pull request #31 from ibirman/refactoring-spelling

Fix spelling errors and some refactoring