CS for hathor

@Bakual you are contradicting yourself if you say that we cannot change things that are not code style and then we remove this.

So let's keep CS issues purely code style fixes to avoid conflicts and then review anything we want.

I'd maybe add a TODO ?