Improve as @philips says