Minor cleanup of src/ directory