Styling merge

Hopefully, this one points to the develop branch. Sorry about before!