Added TODO comments
Organized format