cleaning it up
worked but eclipse is fucked