Added todo, fix standard