Use diamond operator where possible