Refactoring and cleanup

1 job for master
Status Job ID Name Coverage
  Test
passed #102
java gradle
test

00:01:31