This is the only change here, the rest is from reformatting from Eclipse.