couple of cleanups
switch to declarative tab syntax