Make it more readable and set environment varibles