Clean code

Maximumly clean the code.
fning