Code clean up using eclipse