More code indentation work