improved security when sourcing
download size code cleanup