#1 Improve styles

Let's introduce the new names!