comments and code clean up to fix eclipse reported warnings