Code style improvements, getting ready to do new factories.