make code more consistent