cleanup, addressed TODO