Rewrite (change code style)

Before it was ugly…
Now it’s ugly in another way!