Ref #16 - Little style tweaks