snooper fixes
slight cleanup