Cleanup duplicate entry and spelling