Simplify singleton