simplify source code