Fix xml tag empty body warning
Remove unused code
Replace if-else if with switch