code cleanup and code style (PSR-2) fixes
Merge pull request #522 from tiger-seo/master

code cleanup and code style (PSR-2) fixes