jcano/source cleanup