Slight factory cleanup