[CODE STYLE] Improved indentation/newlines