fancy code
Merge branch 'code_cleaning'