Made the app more modular for readablity.