code cleaning
6 files changed