corrected misindented return null