Refactoring and lint fixes.

1 job for jarv/refactor in 3 minutes and 33 seconds (queued for 40 minutes and 46 seconds)
Status Job ID Name Coverage
  Test
passed #47217449
build

00:03:33