Minor style fixes and more use of builtins for restriction tracker