Code cleanup - stop using "`"