Doc Site - code cleanup