Feature/annotate download part2

Yeah but it helps with indentation. If you want removed for stylistic reasons then sure, let's do.