code clean up
4 files changed