Refacctoring - Making the code more Java like