Moving some code to make the design more clear
Some more keywords, pi as a letter