Refactored method contains in Category
Renamed and refactored names

Names are now pep8 valid. This resolves #11.