Fix various indentation errors in Environment