Minor code clean up to remove $(TAB)