Made the code make more sense