Added some todo
Improved performance
Tweaked style