General tidy - mainly commenting