reformatting, lots of work left
Merge remote-tracking branch 'origin/master'