Refactor based on unidirectional dataflow and single source of truth