More cleanup, revert variables