styling, refactoring, addition of older attr names