fix
cleanner code