fix code, refactor styl file