odt: some refactoring + alignments