Consistency fix

Made the code more consistent.