revise module naming
minor code refactoring