Cleaned up the admin options code