Revert "Coding conventions"

This reverts commit dc6b31a5a77943381a22ad003218bb02f0e4c3f6.