simplify architecture