Another attempt to make styles more consistent
Forgot to solve conflict from rebase