Better autodiscovery of categorical data
PEP8