Initial implementation of Current Identifier Highlight Delay option, Code cleanup