Cleaned up item code