Update Part 3 (Code Cleanup)