CONTRIB-4712 Clean up code syntax