Slight factory cleanup
Misc. cleanup