tidying up
Merge branch 'loading_data'