Cleaned up more item handling