Reworked code to make it more readable.