Improved style/naming