[CODE STYLE] Corrected several code style issues