Renamed sniff to features, cleanup of activity