Address bitmap review comment 1

This is definitely nicer code.