Line wrap and indentation fixes