Removing extra blank lines
Small refactor...
Updating document class if it was renamed
Merge pull request #222 from SlavaRa/CodeRefactor-improvements

Updating document class if it was renamed