minor code refactoring.
typo fix.
minor refactoring.
deleted