Services: 'if' can/should be 'else if'