Some source cleanup