Making the project a little bit neater.