Formatting + removed junit tests (not further developed)