model cleanup, consistency