Addresses comments from last commit for 2400