collection of variables for extract method improved
Replace map and getOrElse with fold inspection