fixed formatting and env variable issues