Reorder constructor parameters in a more logical order