Done with rule for now.
Minor changes, going after intellij warnings.