refactor gets [MJ-677]