simplify the style a little but maintain the architecture