Pull request

I cleaned your project up a little...