Starting indentation fixes