Code commented out to make sure it wasn't necessary
Deletes some dross, renames "less" to "mItems", moves stuff