cleaning up
Merge branch 'cleaning_up'