use conditional and remove return