Minor refactoring and reformatting
Minor refactoring and reformatting

zhaoguohui/TransformerKit,mattt/TransformerKit,gaurav1981/TransformerKit,zhaoguohui/TransformerKit,mattt/TransformerKit,mattt/TransformerKit,gaurav1981/TransformerKit