MP-155 #comment Refactor