adapt to firm coding conventions