Just some source cleanup