made code a little more consistent with my current coding style