Removing env script (deprecated)
Style fixes
Updating tests