some cleaning up, also made the eclipse stuff easier to read on github