Made modifications to be more readable.