Some neatification here and there
Add some of the recent ideas