change for better style