Thread-safe creation of singleton
Minor code cleanup

-- it is all about Apple conventions for white space