Format code a bit
Merge remote-tracking branch 'origin/Agatha'