just a branch where Im improving the code readiablity