Improve expressions
Trying to add GOSUB statement