cleanup & review of sources