simplified
Generalized to Janitor
Syntax enhancement