cleanup, utilize factories more