Cleaned reporting code