Fixing indenting and adding some brackets