Autoscaler - minor refactoring