Refactoring in lots of places
Refactored test
Refactored ASTQuery