General tidy up

Switch all %s usage for format to be consistent
Fix a bunch of spacing issues
Inherit correctly in a few classes