Changing some formatting
Merge branch 'working'