Code clean up and adding comments for AstBuilder