cleaner data structures