Restructure some params