SLT-102 post-code-review cleanup of stuff that wasn't optimal and cleanup of IntelliJ templates that cluttered the classes.