Drop more OnClick() and small indentation change