Keeping the code consistency