simplify code and allow better integration in eclipse