Removed Unnecessary comments and white spaces  #4386