More consistent coding style with other modules