Continue to separating script logic