cleaned up some code, we probable use maven instead