Slight cleanup of admin view