add a clear highlight command. clean up code too