Small bugfix - was passing wrong environment
Several style issues fixed