meets requirements
Merge pull request #14 from Hilaryous/cleaning-up

meets requirements