Better Code (2)