A few minor cleaning