Properly handle objects `source' parameter
Code cleanup
Minor fix