T-9. Styles refacoting. Fix #9.