Decreased coupling between WA query code, cleaned up
Cleaned up and commented WA code