Cleanups from the review by SirVer