Factory cleanup.
- Fixed some bad parameters
- Made some code more compact
- Used an invokable where a factory was unnecessary