Clean up #16 slightly