Improve code practice
Add Docs and TODO
Static import count
Add TODO