Indentation changes and check style warnings fixes