Renaming
Added comments
Organised code
Merge branch 'master' into site-integration