Improved style a little bit (spacing