add Daniel James's style suggestions