removed redundant code, mode usefull call to used function