Monster to replace rivets. Style fixes.