I devote this commit to Eclipse.

Most of it is reverting indent and formating changes done by eclipse.
The rest is cleaning up comments.