Made the code easier to maintain