Some cleanup
Some cleanup