Remove comment
Restructure SimpleQueryHelper