logging and spacing cleanup