Removed redundant brackets '{ }' in code
Refactoring of Ast: separation of expressions and statements