Stripped out the invalid code|borderStyle=solid markup so that pages can
be updated without issue. Added final and this to variables and methods.