refractor, add code styles