ok, maybe cleaned up now?