token, number, const refactoring + added const pi