Task/cleanup3

More cleanup
Why Github UI is marking these lines as differents? It seems the same unmodified lines...