merge if-else into if statement
make indentations consistent
group similar tokens on same line in scanner
get rid of weird function type grammar
add higher-order functions