Cleaner check for env variable
Added TODO about example data