Better controller names, removed unsed filters and formatting