Feature/annotate download part2

return statements are not needed at the end of a function if they don't return anything.