STY: More elegant and maintainable style per code review