Cleanup and visibility tweaks
Mark as not CLS compliant
Remove extraneous parameter
Move strings to resources