"Bug CON-64" refactoring of code