Re-did indenting and comments