Style details

Some details which I want to backport also! @Raydiation @raghunayyar @kabum @Kondou-ger check it out! And if you merge, please also backport. :)