Improved the Janitor