Added env + tidying