Making the project code more readable