remove unused method && include handling "pi" token
remove extra newline
add s-expression parsing