fixed execute method call
cleaning up parsing