Reports - modified view names and removed unnecessary code