Improved style in the beginning