Cut the over than 80 columns code
Merge branch 'clean-up'