Code improve