tidy up source code
tidy up source code

sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0,sutthipongl/one5.2.0