Further syntactic changes and standardisation of code

This was a final pass through to filter out old standards. Some static
constructors were changed to factory methods due to their code logic.