move pick simplify and commenting