Tiny code enhancements

- Some little tini-tiny enhancements