[PATCH 3/7] Fix indentation and conform to Coding Style