Cleaned up if-block in download/report