Fix xdebug error and clean up
Merge pull request #4 from bryantebeek/fix/xdebug

Fix xdebug error and clean up