Made code consistant with author style