cleaned up files to work with Eclipse