Cleaned formatting, adjusted plugin handling