Paranoid Preparations/Refactor