Incorporated recommendations from @Kaixiang. Thanks @Kaixiang!