another minor refactor (isn't that every java commit?), removing TODOs