slightly more consistent coding style..