Improved for consistency as suggested by @csain and @djkotowski