Add classes. The structure is clearer.