Better use of ASTNode in StepDefinitionHandler
Cleaning up logging and cleaning up StepDefinitionHandler