code clean up according to Paul's suggestion