change function name
remove useless null checks