Code cleanup based on PhpStorm inspector
Merge pull request #135 from mbabker/cleanup

Code cleanup based on PhpStorm inspector