Minor cleanup of sources