Factory improvements - style fixing.