report updates and cleaned code