Fixed issue: Fixed indents
Fixed issue: Fixed PHPDoc, indents
Fixed issue: Fixed typo
Merge pull request #698 from sergeyklay/small-fixes-and-cleanup

Small fixes and cleanup