Some cleanup and spelcheck