Style and debug spam cleanup