Incorporate @mzgol`s code style feedback