keep code more consistent