Made code more consistent