Address CR, clear up code