Change params format
Clean old design