Changed some code format
Added TODO List