fix and improved style