Prettifying some codes

I tried to prettify some of you codes :grin: