Added more readable code