Cleanup old debugging code
feedback: Style fixes