Okay, right, I missed the comments here. Perhaps a bit confusing to leave this in, but it's your codebase, so whatever works for you :-)