fixed returns types and var name