#115 Minor cleanup