Some refactoring and simple clonotype format