Improve Janitor and related