Tidy

Formatting, constructors, fewer literal constants, references, spelling