just some minor enhancements

Hi...

this humble and minor PR it's just for share some changes that I've made for my personal convenience.

I hope you don't mind... `^_^`

Yup!