Simplifications
Remove redundant tests
Suffix options for repeating constructors