content exists and code clean up