Made code more consistant.