Applied code style and made some cosmetic changes
Applied code style