cleaning up some indentation
Remove unused variables.  Split out shift token reader.  Correct lt/gt precedence
function name tidying, dead comment removal