Remove more debug and fix more indent