CodeRefactoring

Change some code according to CodeConvension