remove unused variable (fix compiler warning with clang 3.1)
replace Point structure with Vector2
make query functions const