#894 Minor cleanup