I12: Made indentation fixes