cleanup code
Merge branch 'clean'