Made style more consistent