Change code style, refractor code