Make minor design improvements