minor update for code cleanning