Not to be mean, but I just really don't care about your project's code consistency. The whole reason I didn't worry about consistency was because there were all these different conventions going on in the code anyway. I tried to change as few lines as possible, but if it bothers y'all that much, then I'm surprised you didn't think to handle the singleton case in the first place -- correct code is far more important than consistently written code.