making the code lighter on the new branch