Code clean, rename css classes