Cleaned up plugin section