Use short-circuited return statement instead of next blocks