Cosmetic cleanup for last commit
Updated version