further simplification of source