Minor cleanup in source