code styled
Need more singleton