cleanup, refactoring, clarity