Fixed style and indentations