I've committed my changes.

Please let me know if you think this is a viable change and I'll try to do it for the rest of the code.

Thanks!