Minor cleanup/enhancements