cleanup, better docs