ENV var setup + minor styling

Hopefully it should be protected