reporting and code cleanups