Added fix and updated indentations