added @return tags and missing return