Cleanup + use different blade template plugin