Changed the code to be more consistent in terms of style.