Another refactor mostly so moving to my workcomp will be nicer also my
OCD was screaming

Signed-off-by: LordIllyohs <lordillyohs@gmail.com>
Damn you whitespaces!!!
prep for maven