Style tweaks
Simplify test