simplification of source code