cleanup interface and privates
2 files changed