Chores: some suggestions