-code cleanup (IntelliJ's suggestions)
-tdd: Swarm class (first batch of requirements, more might follow later)