Clean code
16 files changed