Added an additional step and cleaned some stuff up.