Parse Statement internal refactor