further improvements on refactoring the code and adding links between classes