Did more code cleanup.