Cleaned up environment