more fixes for indenting data definitions