Cleaned up item class