#45 minor cleanup