clean up
Merge pull request #1 from Gazatus/Gazatus

Clean up