refactor & changed style