Cleaned up externs