override dispose & code style update & test case update

override dispose & code style update & test case update