fix wrong removal of ifdef. fix more indent