slight build simplification