Made code more consistent!