Cleaned up item view controller