partial cleanup, functioning better