Code cleanup for positional making it a stand alone operator