Improve code, no longer wanrings (in Eclipse)