Tim's suggestions... Working cleanly now.