[u] Refactor to reduce high couple between classes