Hankanman/PCFControls code health