Small tidy up and added Figaro for env vars