Style guide and RsT fixes