Go through TODOs in the source files

[warpech]

The source files have 1 TODO. Maybe it's a good time to fix it or move it to a separate issue?

[warpech]

Is this the same as #30?

[tomalec]

Yes, as the indication where I think it should be covered.