Migrate from eclipse to lein new; Modfied code to make them more readble.
hm testing??