-improving modularity and readability