Separate indent logic typing handling into own file