Slight changes to Canonical mask engine for better readability