queen attack refactor