Cleaned up code.
Merge pull request #12 from ghostling/CodeQuality

Cleaned up code.