Avoid static block and replace by proper singelton implementation?