Minor cleanup/enhancements

:thumbsup: