Collect global variables from environment vars into var section
Cleaning up code. Adding some styling