Refractored the code to make it more readable