4th commit
Merge branch 'clean_up'