Make sure you fix the indentations and wraps in this file as well. Once you do it through Eclipse, Eclipse sometimes makes mistakes wrapping. In particular, it doesn't wrap when it has to (like the example above), so keep an eye on that. Otherwise this looks good.