Breaking out handlers into separate methods