Cleaned up plugin