:cuncurrent: code refactoring