Made some beautification in plugins