Extracting more stuff into separate methods