Some Fixs
Some Fixs
Some other fix for code writing style