Adapt to coding conventions