Remove logging and add a few spaces