Use diamond operator, remove useless functions.